Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 28 Mar 2012 07:06:14 +0000 (00:06 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 28 Mar 2012 07:06:14 +0000 (00:06 -0700)

Trivial merge